Merge remote-tracking branch 'savannah/master' into feature/tree-sitter

diff --cc configure.ac
Simple merge

diff --cc doc/lispref/elisp.texi
Simple merge

diff --cc doc/lispref/modes.texi
Simple merge

diff --cc lisp/emacs-lisp/cl-preloaded.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/json.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/print.c
Simple merge